Merged headers and placed them into include directory. Cleaned up.