Refactor requirements so they are shared with main build