rearrange commands and move bff into cache location