Moving action annotations into model module. Close #215.
Removed old annotation files in tools module