Better rail services promised in huge shake-up