rearrange packages

remove unused imports
(cherry picked from commit 41ca6ef)
Merge pull request #7 from danielwegener/cxf

minor cleanups