Fixed compilers and make files for new directory structure.