Minor changes to file organisation