more refactoring in Wake - use one class per file in netty package