Organized Classes

Added tree gen