move assets to 2.2 style directories

Change-Id: I4b7f7ef6004ab5da29cf1a6aca91e399f87568be