Merged js folders, cleanup unused js files.
Merge pull request #1 from mvnural/js-cleanup

Merged js folders, cleanup unused js files.