Rearranged some files for clarity