update library structure and paths, add tagging