Restructured, added routing
Quick commit
Test