Added CGI and changed folders