Seperate classes into their own files
Forgot to import files
Merge branch 'organize-manifests'
Fix project name