PSR4
Closes #11
Criteria testing