Re-ordered directory tree
Rearranged tests, rearranged configgui