Merged js folders, cleanup unused js files.