Refactored annotations name and upgraded gradle and build system