[samjsharpe] Reorganise my layout to install fewer stuff