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

Orthography verification needed.