More oop

Made it more object oriented, removed extra files, updated readme