Rearranged the files in a more tidy manner