Major directory restructuration.
Directory restructuration #2.

- Git doesn't seem to recognise that I moved cli.py if this file is still in the directory.