add JMS
refactoring package name + folder name