Reorganise: put Design and Implementation together