Restructured scala project