Restructured index.php and catalogue.php