Moved service and factory classes to correct package