Moved files and modified merge loc to sort the combining out