Moved encapsulation files to "Header\"

All subsequent changes should go in the "encapsulation" branch.