Move other dependencies into new structure