moving file structure around a bit