Refactor package names
Major rewrite of the plugin