Merge pull request #23 from nubs/psr-4

Switch to PSR-4 to simplify directory structure.