Redid previous commit to make it fit more with the rest of the structure of the project