Refactored dir structure