Header file rearranging. Moved all headers into the eli directory.