restructured scala prj