Main class to main module
Merge branch 'Signals' of github.com:start-x/startx-src into Signals