Match changed local directory layout
Add support for Python