Refactored test packages to reflect the structure of the app