Fixing inter-module dependency

The current state of the repo is incorrect/corrupt, it does not build properly.