Reorganise into a multi-module build