Refactor packages - Files compativilty
Improve deploy