changed folder structure around to match the current server configuration.