updated to comply with module naming conventions
updated neming from factory to service - factory is service