removing folder and moving files to main folder