Simplified dir structure