reorganized namespaced, removed util namespace