migrate flex-layout out of layout folder