sorting package structure to avoid duplicating the lib