Moved classes and package to more logical places, now organized based on overall function and relating to each other