Cleaned up code, slight refactoring.
Renamed some javascript files to be more succinct.