GSOC2010:MSNP2P refactoring for aMSN