Reorganized the repo