adding package statements

and some organize imports...
using organize imports