Refactored dir structure.