First step of refactoring to the new structure of configuration and driver structure.

Commit not ready. Just for synchronization between PCs