Restructure for PSR-4 compatibility and Unit Testing