Rearranged files for clarity