reorganizing to get to mefa pkg