Feature/entities/disk

I know, but I thought that was clearer. Probably I'm wrong, but anyway we probably should have some code conventions for this kind of things?