Various tweaks to how files are referenced.
Use Bundler to get dependencies.