Tidied up file structure.
Merged.