moving principal classes into config package