Changed header structure

Now hived off the headers into a sub-directory