diff --git a/www/protected/controllers_/ApiController.php b/www/protected/controllers/ApiController.php
similarity index 100%
rename from www/protected/controllers_/ApiController.php
rename to www/protected/controllers/ApiController.php
diff --git a/www/protected/controllers_/BlogpostController.php b/www/protected/controllers/BlogpostController.php
similarity index 100%
rename from www/protected/controllers_/BlogpostController.php
rename to www/protected/controllers/BlogpostController.php
diff --git a/www/protected/controllers_/HighscoresController.php b/www/protected/controllers/HighscoresController.php
similarity index 100%
rename from www/protected/controllers_/HighscoresController.php
rename to www/protected/controllers/HighscoresController.php
diff --git a/www/protected/controllers_/LogController.php b/www/protected/controllers/LogController.php
similarity index 100%
rename from www/protected/controllers_/LogController.php
rename to www/protected/controllers/LogController.php
diff --git a/www/protected/controllers_/MsmainController.php b/www/protected/controllers/MsmainController.php
similarity index 100%
rename from www/protected/controllers_/MsmainController.php
rename to www/protected/controllers/MsmainController.php
diff --git a/www/protected/controllers_/ProgramsController.php b/www/protected/controllers/ProgramsController.php
similarity index 100%
rename from www/protected/controllers_/ProgramsController.php
rename to www/protected/controllers/ProgramsController.php
diff --git a/www/protected/controllers_/ProgramupdatesController.php b/www/protected/controllers/ProgramupdatesController.php
similarity index 100%
rename from www/protected/controllers_/ProgramupdatesController.php
rename to www/protected/controllers/ProgramupdatesController.php
diff --git a/www/protected/views/blogpost_/_ajaxMarkdownPreview.php b/www/protected/views/blogpost/_ajaxMarkdownPreview.php
similarity index 100%
rename from www/protected/views/blogpost_/_ajaxMarkdownPreview.php
rename to www/protected/views/blogpost/_ajaxMarkdownPreview.php
diff --git a/www/protected/views/blogpost_/_form.php b/www/protected/views/blogpost/_form.php
similarity index 100%
rename from www/protected/views/blogpost_/_form.php
rename to www/protected/views/blogpost/_form.php
diff --git a/www/protected/views/blogpost_/_search.php b/www/protected/views/blogpost/_search.php
similarity index 100%
rename from www/protected/views/blogpost_/_search.php
rename to www/protected/views/blogpost/_search.php
diff --git a/www/protected/views/blogpost_/_view.php b/www/protected/views/blogpost/_view.php
similarity index 100%
rename from www/protected/views/blogpost_/_view.php
rename to www/protected/views/blogpost/_view.php
diff --git a/www/protected/views/blogpost_/admin.php b/www/protected/views/blogpost/admin.php
similarity index 100%
rename from www/protected/views/blogpost_/admin.php
rename to www/protected/views/blogpost/admin.php
diff --git a/www/protected/views/blogpost_/create.php b/www/protected/views/blogpost/create.php
similarity index 100%
rename from www/protected/views/blogpost_/create.php
rename to www/protected/views/blogpost/create.php
diff --git a/www/protected/views/blogpost_/index.php b/www/protected/views/blogpost/index.php
similarity index 100%
rename from www/protected/views/blogpost_/index.php
rename to www/protected/views/blogpost/index.php
diff --git a/www/protected/views/blogpost_/update.php b/www/protected/views/blogpost/update.php
similarity index 100%
rename from www/protected/views/blogpost_/update.php
rename to www/protected/views/blogpost/update.php
diff --git a/www/protected/views/blogpost_/view.php b/www/protected/views/blogpost/view.php
similarity index 100%
rename from www/protected/views/blogpost_/view.php
rename to www/protected/views/blogpost/view.php
diff --git a/www/protected/views/highscores_/list_top50.php b/www/protected/views/highscores/list_top50.php
similarity index 100%
rename from www/protected/views/highscores_/list_top50.php
rename to www/protected/views/highscores/list_top50.php
diff --git a/www/protected/views/highscores_/listentries.php b/www/protected/views/highscores/listentries.php
similarity index 100%
rename from www/protected/views/highscores_/listentries.php
rename to www/protected/views/highscores/listentries.php
diff --git a/www/protected/views/highscores_/listgames.php b/www/protected/views/highscores/listgames.php
similarity index 100%
rename from www/protected/views/highscores_/listgames.php
rename to www/protected/views/highscores/listgames.php