preparing folders/files for merge into master