Moved necessary class files to root of project.