major re-org of folders and much better exception handling