More simple file organisation.