refactored base package to com