Major refactoring done.
Simplified factory infrastructure.
Renamings.