Change directory structure and follow code convention - refs #7225