add Customer; remove "temp" classes