Removed old stuff
Cleanup
Additional routing and code cleanup
Version bump