cleaned up completed dir and controller.py.