Reorganizing package path and .htaccess
Merge branch 'master' of https://github.com/Etiene/sailor