Moved files t' th' src folder
Changed psr-4 definition