Added provider app and reorganization of views