Moved some of the code around in loader to allow archives to load the files too