TestingFiles Update
Refactor

Mainly comments and structure
Update