Initial work on moving aufs to a subpackage