Moved js files to folder; fixed some formatting