Makefile refactored to move definitions in Defines.mk
Modifiled makefile to avoid unnecessary directory change