More cleaning, removed unused classes
Removed more and moved more to the library