Some changes in include structure
Merge pull request #3 from Sigurd3000/master

Some changes in include structure