Moved @Aspect's to .aj syntax (may as well make use of that src/main/aspect directory)