Modifying build modules

We changed structure of our directories. Fixing this.