Did some cleaning-up and renaming of files - <Bala>