Remove use of static base paths

Also some consistency and cleanup.

Change-Id: Ide0ebaf7df1b9bc88d93fb1ad70aac22f5ec17ea