Comments & renaming & packages