Makefile: fix cleanup setting

Signed-off-by: Micky Ching <mickyching@gmail.com>
Makefile: update for restructure

Signed-off-by: Micky Ching <mickyching@gmail.com>