More Refactoring

- Refactored more names and stuff to make more sense
- Began work on Crosshair!
Refactored (didn't sync)

- This was refactored