Package renaming and version check
Cleanup + implemented version check