Changed project organziation from  to .