change mockup2 to mockup, remove old mockup