Org into 100% package structure