Added modules that are going to be part of the aop package. Simplified Module declarations in specs.