Refactoring from *In / *Out to C2S* / S2C* class naming.
Fixing issue with bad refactor.
Clearing up some imports.