Update js files and organizing