refactoring to RRC style structure and it's currently in progress.