Add comments, rename packages