reorganized packaging with models/