Updated the structure of files to match the 0.8.0 file organisation (not verified).

Orthography verification needed.
Updated the structure of files to match the 0.7.1 file organisation.