Moved a lot of things around
Merge pull request #18 from ClassicallyGeek/moveImport

Moved a lot of things around