Move the ModelStub into it's own file