Changed file structure, added merge sort