major refactor of cel component
proper namespaces