rewrite server.Storage to separate folders/files and allow only 1 contenttype per file (half done)