updated project organization