Restructured directories in line with psr-0