refactored folder structure.