Refactor/concatenate

Put all the js files together!