Initial restructuring & tidying