Hierarchy changes

Optimized folder structure