Refactored folder and file structure