Update Makefile to reflect new source path

Change-Id: I8579fd6320cd6c3a0babbce8b236b4e224846930
Update imports to reflect new package path

Change-Id: Ifa4696719134c853f8e49a3c5ad42d1d5fbdc14b