Tidied up further in folder structure