Update directory & file generation as PSR-4 compliant