Move app logic into app/services