Filesystem structure changes

/conf folder added to keep all config files. Now config.php and
upload.htaccess are there