Updated tree and main file