Simplified Directory Structure