Tidy up and refactor package checks.
Add checks for libcontainer