separated checks, changed directory structure