Draft of the new orgaization