Revert source structure
Merge master (Python)
Reorganise for maven