Tidy up tree a bit
Restructing and cleanup