Some fixes on packaging layout.

Signed-off-by: Ronaldo Arrudas <rdarrudas@gmail.com>