fix shared module paths and code improvements