Simplified Makefiles

Signed-off-by: Eduardo Silva <edsiper@gmail.com>