Refactored folder structure.