move dependencies into appropriate role