removed unnecessary files.
Moved into class.