Renamed CompositeState to OrthogonalState and added a new CompositeState that contains vertices without the need for intermediate regions

Also internal refactoring to improve the protected interface.