Moved files to Classes folder