Refactoring hashtags package