Fix old import paths

Some imports weren't changed in the previous patch. This patch fixes
those imports.

Implements blueprint change-marconi-structure

Change-Id: Ib7fc0d0d2067d816d30c7c4c9b0f590cb72010f5
Update HACKING file with the new structure

Implements blueprint change-marconi-structure

Change-Id: Ibfc3fa33b65ae9de7c977b22cffce97bca6bbf13
Merge "Fix old import paths"
Merge "Update HACKING file with the new structure"