Cleanup mockup

Better organise the working and distribution code for the mockup project as well as fix some code after removing overrides