[Branch ~dhis2-devs-core/dhis2/trunk] Rev 6352: re-organized controllers a bit..