Rearranged the file structure