Organize project includes

Signed-off-by: Rodrigo Belem <rodrigo.belem@gmail.com>