started reorganizing to proper include structures
deleted extra file ~