cleaned up file structure
deleted unecessary folder
got rid of extra methods and renamed variables