>small improvements to folder structure