More Cleanup

Bad XML. Merge Conflicts from previous code. Deleted other unnecessary
source folders.  Made it compilable.