Part 1 of refactoring done. It works again, pick this up later
Refactored collections a bit
Server partly refactored
Ignore correct folders
Remove logs
Merge pull request #3 from Tmw/refactor-server

Refactor server