fix folder and package structures from incorrect re-organisation of folder structure