re-organized into a multi project build