normalizing packages, adding applicationcontext.xml