refactor entry points, add globbing