Refactor, allows for nested imports