some restructuring
Merge pull request #7 from BusTicker/server_design

some restructuring and mock data