Modified to work with directory structure changes
Some files missing from assets move