small refactoring of packages + comment service