file structure overhaul