Big file tree reorganisation.

Closes #255.
Should make a lot more sense now ;)