reorg of features and renaming, namespaces