Refactored app dependencies