improved project tree structure