Major changes to structure. SEE index.php make-up