Converted tabs into spaces width 4 under a .new extention
More cleaning up, removed/renamed .new files