cleaned up some files and seperated the class and the code being execute...

...d