First attempt of refactoring to allow for a more modular installation