further changes to folder structure