remodeled imports
refactoring to work on nimbus
merge