Rename some stuff and fix everything for once.
Remove trash files