Re-structured file management