Moving files

moving classes around, next step will be the manifest. Hang on!