Revert "Rename sources directories to get Makefile.am much more clean."

This reverts commit 8b605d18d3d135316584742d0135e081dd02f66f.

This look hacky still and needs better solution. I'm sorry.