renamed class name
restructure: use layers instead of arrays