Moved js files into js folder, and changed some html markup