[imp] Change package structure