Fixes dependencies
Reflows
Fixes conf.py
Changes structure