Restructured the code to follow Cargo’s guidelines