Rename package to correct one
Fix some issues with deploying war file