Refactor packages structure
Follow up with domain.