PSR-4
Splitup handler scripts
Cleaner output
More tests