Refactored folder and files. Removed unused