Several changes in order to adapt to the biicode modularity and build procces. include dir added with entry headers