The whole project at this point is entirely python, with no g13d present anywhere, so let's clean up the tree somewhat and make it flatter.