styling fixes and renaming of files