Started converting, probably won't finish too much work
Reorganizing
Reorganize!!
Add in distutils stuff