Structured app and added mocks