Updating import paths for new structure