Refactored packaging
More closely follows mojang package names.
Todo list of code changes