overhaul folder structure