Moved extrinsic modules into the appropriate sub package and fixed an import (I think...)