Refactor project package

The observer class is depricated anyways, so it will go away soon. Just
some cleanup in the meantime.

Change-Id: Ia3e40e5ab672687f78538fe9c09a94e9ae451040