Added pixel header
Removed step from include dir and removed redundant headers
Made changes to reflect new header dir
Made changes to reflect new header dir