improved filesystem model
further steps for file upload
refactorings