Organization and package updates

Change-Id: I4649b32d8529ca07e518cc9d9ffe6f48ce9b4923