Reorganized solution for build server