Renamed some columns and refactored code for the changes, removed old views no longer being used