removed some unnecesary files
cleaned up file structure and modularity