Rearranging importer methods
Rearranging importer methods

Using a single level of abstraction in the main method, and moving the
other methods around to be in the same order as they are used.

EOL/ggi,EOL/ggi,EOL/ggi