minor changes + moved rest.php to /src