Refactor to use correct npm module structure