tidied folder structure