Some Renamings and removed unused Libs and Classes, Some fixes
Refactorings and Fixes