add new tree tiles
some renaming and clean up