Signed-off-by: André Martins <aanm90@gmail.com>
This change does NO actual code changes other than moving constituent parts into packages.