folder structure overhaul