changing main to use new classes
Relying on preexisting interfaces to make main class cleaner.
Moving files to more appropriate packages