Simplifyied server
Move classes to different packs
Correct executor closing
Correct stream closing