Restructure, removing foundation header