Fixing up the build file after refactoring