Revert #86 and #111

This maintainer merged the pull request in a bit of a rash rush. This pull request is meant to allow us to restart the process of fixing the problem #86 tried to fix: overly long submodule paths.