simplify library structure and paths