organize usings
Merge pull request #1 from jmservera/master

organize usings