Convert to right package structure