Reverting the file path to wip

Reverting the file path to the old version (inside wip); the change had broken the build due to the wrong reference to ../common.avdl. Will be redone through proper PR.