Makefile
changed package directory structure