Separate PuSh implementation from the importer
Add prefix in tools so they appear close to each other