Changed directory structure to meet PSR-0