move resources... again

Change-Id: I90fa77b5ff3923fe82c889fd2d41b48aafc83444