Updated directory structure, apache config