Renamed all files to undercase and minor tweaks