restructure dependencies
restructure