big refactoring -- move clt code to separate files