Split into modules; add lvm/filesystems