Rearranged files, added callbacks for rendering

Rearranged files, added callbacks for rendering to allow an
implementation of a FPS counter