refactor packages and add debug mock-ups