Refactored folder structure