Changed packaged and grunt file + renamed main files