Refactored code/changed directory structure for psr-4 autoloading