Added library structure