Prepare for composer

Change-Id: I79aab0353a5f4a3f43e513591d4d18f75571884a