Merge "rApp all package restructured"