add scala; reorgnaze project;