clean up original classes and split them up into separate files
library loader and start removing proprietary stuff