moved files around and incorporated Foos design