Moving all files to top level, take 2