Fixing commit for 1.6 update directory structure