Add file path related files
Generic dynamic loading
Tidy up path code