file system changes and clean up
Merge remote-tracking branch 'aomame_lib/green'