Directory structure refactored