major phi-full-stack changes
restructure and example