Formatting updates

It is a problem to have both a Python file and a directory called the same thing. Will screw up imports. So one of tem shoul be renamed.