Updated file organisation