added normalize and foundation a different way with my own ordering
clean up
more reorg
reorg again