Updated imports to use relative paths
Updated template code to use module-level singleton