refactored structure
continued refactoring
Windows client is now runnable