Package refactoring III (rename)

Signed-off-by: Dimitrios Mandekis <mandekisd@gmail.com>