minor changes to match directory structure