add some test code to the controller
Fix some files which went missing
fix more files
revert .htaccess
revert .htaccess -_-
Cleanup controllers