reorganise packages and cleanup imports. Improve some class names
merge Resolution and Resolver exceptions