Tidied up structure of content folder