file cleanup and organization