Revert [FXOS-195] combine files for faster loading time