Fixups

* Python branch from master
* Folder hierarchy fixed