Fixes packagestructure