Changed the directory structure and modified import statements to reflect these changes.