Refactored package names.
Little work on team commands.