switch to use loop on importers to fill block elements, clean up directory structure