Complete directory restructuring to test and scripts