refactor packages, add test mockups