Refactoring. Factory added fpr persostence layer, Makefile beautified.