Rename Plugin and do a bit of reorganization