Arrange files.
Now comply with js-bundler. Test added again, using bundling.