Remove references to AOP
Tidy processor directory structure