Move constraints into separate modules