Changed folder structure to match PSR.