Refactored ModulePersistence to be in respective projects