- Refactored files into more cohesive classes