Updated file and directory names to adhere to PSR-0