Refactor and main method
Merge branch 'master' of github.com:Distribuerede-systemer/server