Reorganise python scripts