Re-naming files
Re-factoring - only including js files where needed