Restructuring pom.xml, adding Spring-aop dependencies