Modifications to the headers so that the libraries can be adressed from the present folder