Restructure
Added kadira