issue #3450. move the resource files
issue #3450. fix the commit error
issue #3450. add a res directory prefix
fixed #3450. Finish the res directory
issue #3450. merge & resolve conflicts