better modularization of deploy components