Finished moving and renaming packages. Should be a lot easier to
understand now.