tidied up folder structure