Using new directory structure; simplified Makefile and profile