added back filesystem model.  Still need to fix circular dep between Router and App.