Updating import paths and fixing path redirection.