Removing old file
First round of styling and a couple of renames