Simplified directory structure