Re-organize module