Organized constraint files

Tested working!