Nostalgia back to Extensions not skins

Change-Id: I59a4caeed5d9b59d5c94138f39e557e93174259a