Changed some files and deleted and renamed and stuff