Small cleanup
Changed directory structure to import cleanly