Fixed structure to compliance with PSR-0, autoload in the composer remains unchanged and is correct.