WIP: mockup split into mockup-core and mockup