Tidied up structure

Strting to converge on a structure