removed unnecessary files, put all in class