Added local directory file loading logic

So the logic for loading file is to first look in the directory where
the current file is located, and if it is not found there, then we look
in the project directory.  Did a little code clean up from those changes