Issue #57: some more refactoring, moving elements from App -> Tools