Removed distinction between basic and non-basic constraints
Move stepping over constraint to a separate file