Changes some namespaces related and reorganizes the files related to the current spike on extensibility.