Rename and move indicator related modules and classes