Removed demo namespace and adapted Kernel and routing information