Reorganization and TODO clean-up.