More Project Fixes

The code in BundleFiles.cs is still confusing and poorly organized, and needs refactoring.