remove unneeded folders
renamed different things