Yes. 
I saw no point in having them in differnt directories, that is why I did not want to change it. (I dont like changing something for which I see no cause.)
If you say it is safe, to put them together, and I dont brake more conventions with it (like moving the indexcontetn.php out  from httplib...) then I am willingly doing it. 

  It is a mess, for sure, but dont want to make it even worse.