Reorganized script paths + some map fixes