Package refactoring II

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