Moved lifetime infrastructure to separate folder/namespace