Tidying up and modifying structure, based on seed-element-master best practices