Cleanup

a few cleanups:

- unneeded files,
- tidying up imports
- makedirs for directory building.

Enjoy.

Warning: this is untested.