Updated all moduels and renamed features for proper namespacing