Created some factories to clean up Module.php and removed unused service