move requirements support to new file, update #1554