Files renamed, preventing load fails.
Merge pull request #7 from marcopeters/master

Files renamed, preventing load fails.