Move singleton into class file

- ref: Item #1 of this issue: https://github.com/GigaOM/legacy-pro/issues/3806