Update of libs, Refactored structure