renamed class to proper file structure