Search.php fix and class organization changes