Remove and rename shit
Actually remove it all