[Renamed] a couple of lair directories
[Moved] a few lair files

Change-Id: I0659865ffd67fbca6466c85686a06fef42ea65a1