Move hidden files into folder to prepare for merge