Temporary change in order to fix the build errors, I will put the
original package structure back when I get it to stop failing builds.