Updated Makefile to use serve
Implemented modelFactory