Conversion to python3
small directory structure changes