new file structure and psr-4