changed to psr-4 autoloading in composer, moved all classes up two levels