Initial remove of folder to fix structures