move supervisor files to base package

Change-Id: I858c2cc4e48a10baf2e68f341394b4009f5be039