Rearranged the files, towards a better system.