Items changed location to organize code and a diamond mold's framework was added