FileManager Update

Updating the FileManager to make more sense. Everything got pretty
jumbled. Modified methods which hooked FileManager to work with new
Methods.

No testing done, yet, but everything should still work. Including less
chance of anything throwing NPE.