New directory structure. Configure and Makefile improved