Split the dependencies from runtime and development time.
Small refactoring.