Structural changes

* Added build