Add Ace project. Some other changes...