Tidied project/package folder structure