Refactored Folder Structure