improved file organisation