minor changes, added amd(define) support
minor changes
removed unneded folder