Started implementation of ui-router, ...

fixed some name collisions