fixed import issues, 

everything should run now and everything is in proper folders, need to look at ConstraintTests though (a test is failing that wasn't failing before)