rearranged the file structure