Syncing up packages

There seem to be some issues with git tracking multiple revisions of the plugin as well as confusion between "src/Waterflames" and "src/waterflames", Since java convention is to use lowercase in the package, defaulted the packages as such