Reorganized things into a skeleton of the repo pattern