Refactored to relocate all the files inside one directory