Update how files are loaded
Add some error logging
remove extra file