Refactored type hierarchy. Started implementation of annotation based call binder.