package structure re-organisation