[Moved] more lairs into sub-folders

Change-Id: Ib37518e579795a148f8c3b97b9340f0d5317ce48