Clean-Up and Comments

Code cleaned up, files renamed for consistency, comments made on js
files