Move reusable components.
Start reorg of code to be more modular.