strip spaces

Change-Id: Iaaac55c494110273c21ce872a33b7b5edfb7a172
mv files

Change-Id: Ie579175b4e06b2227fd6c361dacdca73946021c1