Import reorganized :)
Merge pull request #8 from danielsoro/imports

Import reorganized :)