small reorganisation, preparation for startup