refactored and removed unnessesary files.