changed structure of files to allow better symlinking on server