Did some restructuring