Organised packages, cont (renames and moves)
Organised packages, cont (refactoring)