Finally managed to get away from that damn submodule. Now back to previous
directory naming.