Reorganize directories

Change-Id: I7e961efaf631b6388991bbba5fdcddb99652b17f