All classes refactored into their own files and importing correctly