Refactored Folder Structure.