Resorted package structure

Signed-off-by: Mark Patching <markp.patching@gmail.com>