Renaming stuff
Remove excess files