Refactored packages, added message after deployment, clean code