More testing.
Structure changes.
A bit more changes to includes and file structure.