Various Changes and includes top level .htaccess file