Restructured requirements, config and objects