Rearranged the file structure for better organization