Clean up and New Sprites

Started drawing new sprites and moved some stuff around