Clean up Milka, and organize class structures