Language organization overhaul