Bug: 848604 Abstraction for app directories