add comments tasks, organize packages