Start reorganisation to 'build' setup