Add attribute grammar package
add shuffle package