Bug fixes

* Files added using a relative ID path would recreate the file path
given when generating meta files.
* Cleaned up some duplication in file loading.