Refactored FileIO into more logical files

Also sped up trending reading