Finish rename of python packages

Some more changes were needed to make an actual
python package out of the modules after renaming folders.

Change-Id: I812c2a681867951ce5b8c0eace5baca39cada624