Removed Group and Survey Controllers. Put them in "Controller.java".