Refactor lib locations and add style