Moved class files to proper directory