Moving around the files to play nice with bundlers