major restructuring
merged new structure