renamed some key packages and updated spring configuration file accordingly