Structure rework

finished structure rework