Split up main import into separate files

...and rename a few things
Accidentally committed horizontal bar extension
Merge pull request #3 from incuna/split

Split up main import into separate files