Moved annotations to annotations package