Refactoring MoCap classes.

In the process of refactoring code.