major changes in the dir structure; makefile substantially modified; more work is needed