Moved some headers to appropriate folder.

Also created a header file for the encapsulation. The documentation will need to be updated :P