Changed folder structure and updated parts list