cleaned up ; moved penn stuff to one folder