Fix the directory structure for comply Psr-0 standard