rejig to folder structure
change to files
tidied and ready