Change directory layout and minor adjustments

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