Rearrange package structure

I used the refactoring tool. It does make life a lot easier!