fixed circular dependency + simplified APIFactory, no longer calling mapper functions and broke up into smaller functions + moved logic of saving data into controllers
minor update - minor refactoring