moved my controlled class to a different folder

and made a bunch of changes