Better files hierarchy
Better files hierarchy and file deletion