cleaned up naming/routing conventions
cleaned up naming/routing conventions