Cleanup & renaming
Classloading for serialization
Rename datasource
String fix