Reorganized and cleaned couple of files
Added html beautification