Fixed makefile
Moved bundled dir and fixed make bundle