Changed project structure to be more PSR-4 compliant