Refactored app into a new package.