bug fixed. 
Renew the getBucket function.
Renew some directory name.

Change-Id: Ic6a9baca540127b79d07a336ac8cda313887819e