Packages refactoring. Auto-redeploy finally works!