flatten package hierarchy

Change-Id: I8b8e4aa7cbaa181a3816335eb4940efc1d5f308b