Renamed js files to be more in line with naming conventions. Cleaned up datafiles.