Restructured directories and added cascade_embedded_list