Clean up.

Clean up. and clearer categorisation of files/packages and overall
imports.