File paths fix and PHPdoc blocks