Feature/structure overhaul