Change names and improve organization