Cleanup

-Updated channel routing
-Reorganized models