One last package refactoring
Merge branch 'master' of github.com:Pheasn/ServerBase