Code cleanup: remove old lane cruft that isn't being used
gui-modules made include-safe
Refactor to use classes instead of bare functions