Relocate file loader
Code cleanup