Merge TaskItems class into Contents class for better readability. Also fixes #35