changed FS layout ; updated Makefile