Deleted some stuff and moved other files.