Fix issues #302 - Change dependency loading files to match proper repo/f...

Closes #302