Rename folder structure and complete tests