Revert "More structure"

.htaccess

@@ -1,11 +1,12 @@
-# Mod rewrite
-RewriteEngine On
+Options +FollowSymLinks
+RewriteEngine on
 RewriteBase /
+RewriteCond %{HTTP_HOST} ^www\.(.*)$ [NC]
+RewriteRule ^(.*)$ http://%1/$1 [R=301,L]
+
+RewriteCond %{REQUEST_URI} !(/$|\.) 
+RewriteRule (.*) %{REQUEST_URI}/ [R=301,L] 
 
-# Route all requests to index.php unless real file or folder
 RewriteCond %{REQUEST_FILENAME} !-f
 RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule ^(.*)$ index.php?q=$1 [L,QSA]
-
-# Disallow directory listing
-Options -Indexes
+RewriteRule /(.*)$ /$1 [L]