Reorganize common infrastructure

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>