Simplified directory layout