Revert "Change the importing files order"

Reverts matthewhartman/base#32