Restructuring and somee minor updates