bug fixes and renaming files for standardization