File re-organization as described in Issue #77.
Closes Issue #77