Simple cleanup/refactoring
Some namespace reorganization
Yet more namespace reorganization
Setup for expansions and jist preprocessing