IDE-1271

Notes:
Put the class comments in right place