Did some refactoring of directory structure and got the loader working.