Systems and components now sorted in folders, mainstate and shopstate updated
Merge branch 'sorting'
little Bug in MainState fixed