Moved annotations to an annotation package

Added some annotations to Main