Refactoring in preparation for exp sources implementation.
Updated imports