Start on separating app/window from lib/stage