Convert to python3 with 2to3
Merge branch '2to3' into develop
Reorganise so files start in top directory
Merge branch 'develop'