Refactored subdirectories