Move model to models/, fly-by on package ordering