Trimmed out some unneeded code since things are being changed as well as switched to HashMap for FileCollection to provide quick searches.