Move from lib to jars