Added the htaccess copy.
Updated some directories
Added some more tests.
Merge branch 'feature/htaccess' into develop