Flattened out the hierarchy. It was too much, and I wanted to practice with git anyways