Build a saner structure