Added some basic package separation to the codebase to make editing easier.