Moved classes outside of project file