Rearranged the files once again