Move emit point tool to separate class