Refactory: tree and property moved to api project