Reorganized the code folders