Split annotations and comments into separate controllers, fixed annotations and updated blade structure