cleanup and file naming convention changes