Move helpers to HS:Helpers
Bundle update