Cleaned up Router
Changed model
Moved interfaces
Tests added