place assets in correct folder
merging