WIP: Reworking the file organisation for the 0.5.0 architecture I want.