Moved cakes to its own package