Move class into own file, add magic word

Change-Id: I210449ef396634cb65ff67c37713417823abb73a