Second restructuring

Change-Id: I72465c1d34e3f07e4f25948a6c694906d7af274a