tidied file structure