Changed class files to fit project.