BUG-753: Turn stateful/impl dependecies around

Change-Id: I91bfb1d6d208fcbfb5423c6d7c97297a80d7387b
Signed-off-by: Robert Varga <rovarga@cisco.com>