Added factories for individual flow classes, refactored package names.