Separated hive from layouts