delete old packages
Merge branch 'master' of https://github.com/hamidelmi/EP_BES2013
fix naming conflicts