Preliminary setup for splitting a requirement.
Also changed some comments.

Signed-off-by: Tushar Narayan <tusharnarayan@gmail.com>