Remove aspectj configuration from the project.
Redesign events infrastructure.
Redesign package structure.