Refactoring

Removed some files, started breaking up the CustomLoop class.

[Branch: dev1.2.5]