Removed unneeded libs/code, switched to class model