Removing old files, updating with final code