File management overhaul