Rename files
General cleaning up of code and adding commnets