Adding comments
Reorganizing packages
(Re)Adding Indicator suffix to indicators