* attempt to fix the folder structure