Major file structure overhaul