Re-jig some things.

Change folder structure to tidy ends up. Everywhere should have it’s
own place.