Refactoring and removing unused clssess
Changed organization of the classses and files