Moved the embedded libraries into an external libraries bundle. Refactored some classes