Added unpacked devise to follow code structure