added server skeleton and some more restructuring
merged these changes into master as well