Start v2.0 main.py

Just a tidy up of module doctoring and import statements.