Fix package structure complete

~requested: 50

@bkiefer13