File manager code cleanup

Working on issue #5