organize imports
Merge pull request #8 from fredsa/organize-imports

organize imports