Changed file organisation.