Restructure requirements