Refactored folder structure. Removed unnecessary code