CON-2004 move user tools related things to seperate files and add tracking for user tools