Add course package and fix other content types

Remove these comments.