Moved out JourneyBuilder from JourneyFactory.
Cleaned up usings