Cleanup and prepare for the new source base.

Signed-off-by: Gary Pamparà <gpampara@gmail.com>