Tree clean up, now most branches lead somewhere

Signed-off-by: GreatEmerald <pastas4@gmail.com>