Reconstruct filesystem model and GUI model. #3 and #4 fixed.