Update files to use spaces instead of tabs
Update Files and Classes to fit Naming guidelines