src: Small source reorganization

Change-Id: I442f3ad0392ef4220e6435fc48e6d69acbd02076