Cleanup vol 3

Folders. Testfuncs moved to menu.
Unstable and untested.