Move to source
Change config
Move htaccess
merged
Merge branch 'penibelst-move-source'