Update javascript structure, Clean up.