Moved classes and chnaged infrastructure towards accomodating process
teams