reorganized files, edited paths
moved .htaccess into /public
git-related issues