cleaned up package imports on all pages