Tidy into xtal.*
Renamed