Converted to psr-4 and refactored folder structure