Fix error with moving e2fsprogs-uuid to libuuid-devel, also refactoring