Allow multiple structure includes.
Split and extend test-files.
Bump Version 0.2.5