Move inlined class to it's own file.