Move some classes to appropriate NS