Minor fixes to folder structure