Organized (and removed unnecessary) package imports

Change-Id: I07b73a643623936fb20da4ea184fcdb881ea0d35