Reorganise to build mode demos