Minor file path cleanups.
Add the call to __init__ to support the new directory/package structure.